Cleanup by utilizing CorePrelude

No changes in functionality here