merge dev; cleanup