Clean UP old code