clean up

clean up unnecessary files, place correct source from branch