Remove Castle references