Removed more unnecessary stuff