Cleanup of dev