Removed tests and methods that weren't being used.