Simplified If statements.
Deleted unused methods that are not needed.
Removed method arguments not being used.
Added Override to methods that needed it.
Imports changed since code changed.
Various other changes to simplify the code.