Cleanup and liquify

Removed Dual Sim stuff