Improved site removal, now works properly