Massive code reduction

Realised half the code was unneeded ._.