Small changes: removed odd methods