target specific users and code cleanup