removed all old commented code