Cleanup code & remove deprecated method