Finally removed all the _site stuff