Removed grill files
Fixed UTs and javadoc