Remove package variables (based on #5)