Cleaned maven stuff