Removing idiotic flags; code cleanup; making module substantially less terrible