Devel cleanup