Cleaning up some parts