clean up unused code
create site objects on require