Initial clean up to remove Wake dependency