Removing stupid variables :-p