Mind squashing your commits and removing this? Thanks.