cleaning up excess files, lines of code
fixing some git conflicts