Removed numpy dependency