Refactored cleanup controller and models
Removed jinput from model
Fixed Language