Build cleanup & checkstyle

We need these properties