Removed commented code - git will history this!