Moving out of beta

Also got rid of two obsolete files