Minor bug fixes and removing stuff