Cleaning up the interface a bit. Removing unused parameter and some dead code.