Cleaned up xml and updated maven dependencies