Removed some code I was no longer using

Also fixed a few issues..