Some bug fixes.
Removed unecessary files.