[master] Removing a few more unnecessary parts