remove old unnecessary code
-Bugfix for wrong tablename
-Return value
Add some carrier entries