clean up

change aspect name, removed not used imports