Cleaned up a bunch of unused methods and consolidated overloads