Cleaned up remove runs