Removed master var and relevant code