Removed unneccessary interface code