Simplified and removed un-needed functionality