Removed old code and 1.5 release ready