Removed everything that was in Java