Even more cleanup, removed a lot of arch dependent code

Even more cleanup, removed a lot of arch dependent code #8