cleaned up Field
removed commented code in Code