Rails refactor attempt

Remove these guys too.