Cleanup and remove extra code.