method structure cleanup