Clean up
Merge branch 'master' of https://github.com/tylerm-/lyralsys
Clean up