Remove redundant entry points