Add fix for bug discovered in Flatshare
Fix merge issue from Share-House
Remove the cron job