cleanup, proper licensing