updated clustering; remove unnecessary objects