Removed unnecessary methods
Moved requesting of context to AliasFinder