Workspace clean up and version no. correction