Removed unnecessary stuff for now