Cleaned up valid units