First batch of instructions cleanup