Merge changes from slimbean
delete obsolete file