Fix 404 and remove not used stuff