Fixing clean/stop methods to work as name suggests