Removing non-functional proxy
Tweaking class availability
Build the site in a separate process