remove dev message and cleanup