Cleaned up old staff