code cleanup for jenkins