Bugfix (no DELETE or PUT worked) + clean up