Removed dead and commented code