Added new Service Class onBootService, For our set on boot options
Cleaned up Trash Left by the WSM (White space Monster)