cleaned out globals