__init__ cleanup