Checkstyle & stuff

rm commented stuff