Cleanup, move usertable method to usertable