Update solAdvanced.java

Neated up code slightly and removed unused features.