Added pic flag to base command
Removed unused files