clean-up: killing whitespace, empty clases and non-essential tests