Testing?
Removed more code that is no longer needed.