- added activation/cleanup codes