Take away undeed comments and functions