Add AvondaleCastle, remove unused imports