Remove old aspect stuff and added custom contexts