Build cleanup & checkstyle

Needless