Code cleanup. Deleted some FIXME's, comments and more stuff