Remove categories
Remove limit from controller
Remove unused variable