Removed commented codes for cleanup