Removed: obsolete files
Merged common functionality.