Code cleanup and component activation