Pushed debug code previously, cleaned up property