Removing some unused variables and params (Issue #5)