General cleaning and organisation

remove unused library

clean up script