Removed Unused Java Files

Fixed Bugs, Removed Unused Java Files