Decrease wait time and remove unused rake task