Removed CanCan, busted some errors