minor refactoring: removing unwanted stuff