Removing bug-assist