Removed mess code lines