Removed the split setup

Change-Id: I0caa1a5e8f46eb9b0edd735eca1e5b4d692d2d65