Removed surplus variables