Migrated to later versions and did workspace cleanup

Signed-off-by: Ippoippo <ippoippo-software@ippoippo-eco.com>