commit two

got rid of a lot of commented code