Cleaned up the dev branch