Removed unused code and added override annotations