Removed unneeded vars, method calls