Code cleaning, refactoring, 'asset rm' functionality