Remove mass assignment hacks