removed irrelevant thigns