Remove more code which is currently not in use (due to removing original site builder factory)
Remove some usings