Removed JDK1.8 code (temporarily) and reworked desktop launcher so code can be called from another program (AM)