got rid off commented stuff