Removed unnecessary variables in phase classes