Removed controller stuff