Stop functionality, some cleanup