deleted dashgum and general cleanup