Revert "Improved pom.xml"

This reverts commit 94c294647d7589e616ddc34d8c464e375f1f9ca9.
Revert 94c2946..7ce7aad

This rolls back to commit 94c294647d7589e616ddc34d8c464e375f1f9ca9.
Revert 6bfcc09..d8a1073

This rolls back to commit 6bfcc09808d9293298c5e9c61aa6ef1d8131eee3.