clean up only - removed obj. usage