Removing initial code set
Further fixes.