Removed some variables for inheritence