Removed more unnecessary things