Cleanup, leave the other old functions for now for testing purposes