Removed old code, fixed site initial load