Cleaned up unneeded files
Various fixes/improvements