Deleted unwanted code + fixed some checkstyle issues