Removed system dependencies, now everything should be mavenized correctly