Removed extraeneous code from partials and controllers