removed site and site-static for factoring and overhaul