Simplified a bunch of stuff, got rid of an untested method