removed unused use statements, fixed typo and group tag