Some clean up - still needs all the PCSS doing