DEV cleanup