got rid of uneeded commented code