Deleted some dead code
Change some bools to enums