cut out unnecessary code

closed #2
closed #3