Cleanup minor things

Adding back sip won't affects us