Optimize + Cleanup website