Cleaned up attachements