Remove unnecessary field
Cleanup unused code