deleted more irrelevant things