Fixed imports, removed unnecessary class