Fix warnings, remove unused controller