more cleaning up, this should finally take care of it