bug cleanup