Removed cruft
Used the proper namespace