Removed some unneeded things