Fixed all TODOs in java code