movshare code cleanup