Removed more non-working stuff.

To be added back later once it's working.