Major Cleanup of files and removal of dead-end dev