Fix code style
Remove some build commands, refactor to be Ant based