remove commented, cleaned up