General clean up and removing old code.