Cleaning up a bit: added @Deprecated to old net classes and removed a library
Minor fixes