clean issues with improved site setup