A bit eager on that last commit. Removing some code used for manual testing