Removeed old commented code