[#36] Removed unnecessary methods
[#45] Removed unnecessary methods. Better use of current_user