Remove some dead-ends and console.logs