removed cancan & modified controlers using cancan methods