major clean up. only needed files left