Cleaned up after adding Maven support