cleanup, unnecessary variables