Removed unnecessary stuff/bugs