remove these return statements