Update 2.2.1 - Small Clean-Up