Stripping out old logic and tweaking properties.