Remove Hardcoded join \o/ #9