Prevent topic spam, remove return statement