Removed all comented code