Removed unnecessary class generic parameters and updated readme to match.