clean up code, remove nonsense.