Fixed Query
Delete unused methods