Finishing support for file-shortcuts
Removing System.out