Code cleanup, removed unused task
Version 0.7.2