(Re)moved unneccessary parts