Removal of warnings and basic package cleanup.