Remove unneccessary java byte code files
Add several optimisations