Cleanup to get the server side compiling