remove class, not used
missing returns
missing dependecies
remove unneeded dependencies
remove whitespace