Removed all misc commented code