general cleaning up
merged