Code and project propertires cleanup