removed remaining "return" for development