videlalvaro general cleanup