Removed a redundant test
Removed unused 2011 code