Renamed some things, removed stupid deactivate method